Merge git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <[email protected]>
Tue, 27 Sep 2016 16:48:18 +0000 (12:48 -0400)
committerTom Rini <[email protected]>
Tue, 27 Sep 2016 16:48:18 +0000 (12:48 -0400)

Trivial merge